170. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:00 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

170.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/view/frontend/templates/porto/csssettings.phtml2019-11-28 04:00:20 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/view/frontend/templates/porto/csssettings.phtml2021-01-28 12:59:36 +0000

170.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged5180
Changed36
Inserted00
Removed130

170.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

170.4 Active regular expressions

No regular expressions were active.

170.5 Comparison detail

1 /** 1 /**
2  * WARNING: Do not change this file. Your changes will be lost. 2  * WARNING: Do not change this file. Your changes will be lost.
3  * <?php echo date("Y-m-d H:i:s"); ?> 3  * <?php echo date("Y-m-d H:i:s"); ?>
4  */ 4  */
5 <?php 5 <?php
6     $s = $this->getConfig("porto_settings",$this->_coreRegistry->registry('cssgen_store')); 6     $s = $this->getConfig("porto_settings",$this->_coreRegistry->registry('cssgen_store'));
7     $_helper = $this->helper('Smartwave\Porto\Helper\Cssconfig'); 7     $_helper = $this->helper('Smartwave\Porto\Helper\Cssconfig');
8      8 
9     if(isset($s['custom_settings']['custom_google_fonts']) && $s['custom_settings']['custom_google_fonts']) 9     if(isset($s['custom_settings']['custom_google_fonts']) && $s['custom_settings']['custom_google_fonts'])
10         echo $s['custom_settings']['custom_google_fonts']; 10         echo $s['custom_settings']['custom_google_fonts'];
11 ?> 11 ?>
12 body.boxed { 12 body.boxed {
13 <?php if(isset($s['general']['boxed_bg_color']) && $s['general']['boxed_bg_color']): ?> 13 <?php if(isset($s['general']['boxed_bg_color']) && $s['general']['boxed_bg_color']): ?>
14     background-color: #<?php echo $s['general']['boxed_bg_color']; ?>; 14     background-color: #<?php echo $s['general']['boxed_bg_color']; ?>;
15 <?php endif; ?> 15 <?php endif; ?>
16 <?php if(isset($s['general']['boxed_bg_img']) && $s['general']['boxed_bg_img']): ?> 16 <?php if(isset($s['general']['boxed_bg_img']) && $s['general']['boxed_bg_img']): ?>
17     background-image: url(<?php echo $_helper->getBaseMediaUrl()."porto/boxed_bg/".$s['general']['boxed_bg_img']; ?>); 17     background-image: url(<?php echo $_helper->getBaseMediaUrl()."porto/boxed_bg/".$s['general']['boxed_bg_img']; ?>);
18 <?php elseif(isset($s['general']['boxed_bg_color']) && $s['general']['boxed_bg_color']): ?> 18 <?php elseif(isset($s['general']['boxed_bg_color']) && $s['general']['boxed_bg_color']): ?>
19     background-image: none; 19     background-image: none;
20 <?php endif; ?> 20 <?php endif; ?>
21 <?php if(isset($s['general']['boxed_custom_style']) && $s['general']['boxed_custom_style']): ?> 21 <?php if(isset($s['general']['boxed_custom_style']) && $s['general']['boxed_custom_style']): ?>
22     <?php echo $s['general']['boxed_custom_style']; ?> 22     <?php echo $s['general']['boxed_custom_style']; ?>
23 <?php endif; ?> 23 <?php endif; ?>
24 } 24 }
25 <?php 25 <?php
26 $product_image_size = 49; 26 $product_image_size = 49;
27 $product_info_main = 49; 27 $product_info_main = 49;
28 if($s['product']['product_image_size'] == 1) { 28 if($s['product']['product_image_size'] == 1) {
29     $product_image_size = 8.17; 29     $product_image_size = 8.17;
30     $product_info_main = 89.83; 30     $product_info_main = 89.83;
31 } else if($s['product']['product_image_size'] == 2) { 31 } else if($s['product']['product_image_size'] == 2) {
32     $product_image_size = 16.33; 32     $product_image_size = 16.33;
33     $product_info_main = 81.67; 33     $product_info_main = 81.67;
34 } else if($s['product']['product_image_size'] == 3) { 34 } else if($s['product']['product_image_size'] == 3) {
35     $product_image_size = 24.5; 35     $product_image_size = 24.5;
36     $product_info_main = 73.5; 36     $product_info_main = 73.5;
37 } else if($s['product']['product_image_size'] == 4) { 37 } else if($s['product']['product_image_size'] == 4) {
38     $product_image_size = 32.67; 38     $product_image_size = 32.67;
39     $product_info_main = 65.33; 39     $product_info_main = 65.33;
40 } else if($s['product']['product_image_size'] == 5) { 40 } else if($s['product']['product_image_size'] == 5) {
41     $product_image_size = 40.83; 41     $product_image_size = 40.83;
42     $product_info_main = 57.17; 42     $product_info_main = 57.17;
43 } else if($s['product']['product_image_size'] == 6) { 43 } else if($s['product']['product_image_size'] == 6) {
44     $product_image_size = 49; 44     $product_image_size = 49;
45     $product_info_main = 49; 45     $product_info_main = 49;
46 } else if($s['product']['product_image_size'] == 7) { 46 } else if($s['product']['product_image_size'] == 7) {
47     $product_image_size = 57.17; 47     $product_image_size = 57.17;
48     $product_info_main = 40.83; 48     $product_info_main = 40.83;
49 } else if($s['product']['product_image_size'] == 8) { 49 } else if($s['product']['product_image_size'] == 8) {
50     $product_image_size = 65.33; 50     $product_image_size = 65.33;
51     $product_info_main = 32.67; 51     $product_info_main = 32.67;
52 } else if($s['product']['product_image_size'] == 9) { 52 } else if($s['product']['product_image_size'] == 9) {
53     $product_image_size = 73.5; 53     $product_image_size = 73.5;
54     $product_info_main = 24.5; 54     $product_info_main = 24.5;
55 } else if($s['product']['product_image_size'] == 10) { 55 } else if($s['product']['product_image_size'] == 10) {
56     $product_image_size = 81.67; 56     $product_image_size = 81.67;
57     $product_info_main = 16.33; 57     $product_info_main = 16.33;
58 } else if($s['product']['product_image_size'] == 11) { 58 } else if($s['product']['product_image_size'] == 11) {
59     $product_image_size = 89.83; 59     $product_image_size = 89.83;
60     $product_info_main = 8.17; 60     $product_info_main = 8.17;
61 } 61 }
62 ?> 62 ?>
63 @media (min-width: 768px) { 63 @media (min-width: 768px) {
64     .page-layout-1column .product-info-main, .page-layout-2columns-left .product-info-main, .page-layout-2columns-right .product-info-main, .page-layout-3columns .product-info-main
 {
 64     .page-layout-1column .product-info-main, .page-layout-2columns-left .product-info-main, .page-layout-2columns-right .product-info-main, .page-layout-3columns .product-info-main,.page-product-downloadable .product-options-bottom {
65         width: <?php echo $product_info_main."%"; ?>; 65         width: <?php echo $product_info_main."%"; ?>;
66     } 66     }
67     .page-layout-1column .product.media, .page-layout-2columns-left .product.media, .page-layout-2columns-right .product.media, .page-layout-3columns .product.media
 {
 67     .page-layout-1column .product.media, .page-layout-2columns-left .product.media, .page-layout-2columns-right .product.media, .page-layout-3columns .product.media,.page-product-downloadable .product-options-wrapper {
68         width: <?php echo $product_image_size."%"; ?>; 68         width: <?php echo $product_image_size."%"; ?>;
69     } 69     }
70  70 
71     .page-layout-1column .column.main > .custom-block ~ .product-info-main, .page-layout-2columns-left .column.main > .custom-block ~ .product-info-main, .page-layout-2columns-right .column.main > .custom-block ~ .product-info-main, .page-layout-3columns .column.main > .custom-block ~ .product-info-main { 71     .page-layout-1column .column.main > .custom-block ~ .product-info-main, .page-layout-2columns-left .column.main > .custom-block ~ .product-info-main, .page-layout-2columns-right .column.main > .custom-block ~ .product-info-main, .page-layout-3columns .column.main > .custom-block ~ .product-info-main {
72         width: <?php echo $product_info_main*0.75."%"; ?>; 72         width: <?php echo $product_info_main*0.75."%"; ?>;
73     } 73     }
74     .page-layout-1column .column.main > .custom-block ~ .product.media, .page-layout-2columns-left .column.main > .custom-block ~ .product.media, .page-layout-2columns-right .column.main > .custom-block ~ .product.media, .page-layout-3columns .column.main > .custom-block ~ .product.media { 74     .page-layout-1column .column.main > .custom-block ~ .product.media, .page-layout-2columns-left .column.main > .custom-block ~ .product.media, .page-layout-2columns-right .column.main > .custom-block ~ .product.media, .page-layout-3columns .column.main > .custom-block ~ .product.media {
75         width: <?php echo $product_image_size*0.75."%"; ?>; 75         width: <?php echo $product_image_size*0.75."%"; ?>;
76     } 76     }
77 } 77 }
78 <?php if(isset($s['category_grid']['xs_one_column']) && $s['category_grid']['xs_one_column']): ?> 78 <?php if(isset($s['category_grid']['xs_one_column']) && $s['category_grid']['xs_one_column']): ?>
79 @media (max-width: 480px){ 79 @media (max-width: 480px){
80     .products-grid .product-item { 80     .products-grid .product-item {
81         float: none; 81         float: none;
82         width: 100%; 82         width: 100%;
83         padding: 10px 0; 83         padding: 10px 0;
84     } 84     }
85 } 85 }
86 <?php endif; ?> 86 <?php endif; ?>
87 <?php if(isset($s['general']['disable_border_radius']) && $s['general']['disable_border_radius']): ?>    
88 .page-header .switcher .options ul.dropdown, .page-footer .switcher .options ul.dropdown, .minicart-wrapper .block-minicart, .product-item .tocart, .bundle-options-container .block-bundle-summary .product-addto-links > .action, .product-item-actions .actions-secondary.action, .action.tocompare, .product-addto-links .action.tocompare, .product-social-links .action.tocompare, .wishlist.split.button > .action.split, .product-social-links .action.mailto.friend, .product-social-links .action.towishlist, .block-bundle-summary .action.towishlist, .product-item .action.towishlist, .table-comparison .action.towishlist, input[type="text"], input[type="password"], input[type="url"], input[type="tel"], input[type="search"], input[type="number"], input[type="datetime"], input[type="email"], .footer-middle .block.newsletter input, .footer-middle .block.newsletter .action.subscribe, .filter-options-title, .filter-options-item.active .filter-options-title, .filter-options-content, .filter-options-title:after, .toolbar select, .swatch-option, .pages .page, .pages .action, .fotorama__stage, .fotorama__nav--thumbs .fotorama__thumb, .fotorama__nav .fotorama__thumb-border, .input-text.qty, .qty.field .qty-changer > a, button, a.action.primary, textarea, .minicart-items .item-qty, .block-minicart .block-content > .actions > .secondary .action.viewcart, .cart.table-wrapper .product-image-container, .cart-summary, select, #discount-coupon-form #coupon_code, .abs-discount-block .actions-toolbar .action.primary, .abs-discount-block .actions-toolbar .action.cancel, .block-compare .action.primary, .cart-summary .block .actions-toolbar > .primary .action.primary, .cart-summary .form.giftregistry .fieldset .action.primary, .paypal-review-discount .actions-toolbar .action.primary, .paypal-review-discount .actions-toolbar .action.cancel, .cart-discount .actions-toolbar .action.primary, .cart-discount .actions-toolbar .action.cancel, .login-container, .form.password.reset, .form.send.confirmation, .form.password.forget, .form.create.account, .form.form-edit-account, .form-address-edit, .form-newsletter-manage, .message, .box .box-title, .box .box-actions, .customer-welcome .header.links, .btn, .cms-index-index blockquote.testimonial, .recent-posts .item .post-image, .prev-next-products .product-nav .product-pop, #newsletter_popup, .product-label, .page-header.type11 .navigation li.level0.active, .page-header.type11 .navigation li.level0:hover, .filter .filter-current-subtitle, .filter-actions, .products-grid .product-item .product-item-info:hover .weltpixel-quickview.weltpixel_quickview_button_v2, .block-header-customer-login, .bundle-options-container .block-bundle-summary .product-addto-links > .action, .product-item-actions .actions-secondary.action, .action.tocompare, .product-addto-links .action.tocompare, .moved-add-to-links .action.tocompare, .product-social-links .action.tocompare, .wishlist.split.button > .action.split, .product-social-links .action.mailto.friend, .moved-add-to-links .action.mailto.friend, .product-social-links .action.towishlist, .product-addto-links .action.towishlist, .block-bundle-summary .action.towishlist, .product-item .action.towishlist, .table-comparison .action.towishlist    
89 {    
90     border-radius: 0;    
91 }    
92 .sw-megamenu.navigation li.level0.fullwidth:hover > .submenu, .sw-megamenu.navigation li.level0.staticwidth:hover > .submenu, .sw-megamenu.navigation li.level0.classic .submenu, .sw-megamenu.navigation li.level0.classic .subchildmenu .subchildmenu, .sw-megamenu.navigation span.cat-label, .category-boxed-banner .owl-item .item, .iwd-summary-cart, .iwd-one-page-checkout-sidebar .iwd-opc-block-summary {    
93     border-radius: 0 !important;    
94 }    
95 @media (min-width: 768px) {    
96     .block-search input, .page-header.type1 .navigation > ul, .navigation li.level0, .page-header.type1 .navigation li.level0.parent:hover, .page-header.type1 .navigation li.level0.active, .page-header.type1 .navigation li.level0:hover, .page-header .navigation .level0 .submenu, .product.data.items > .item.title > .switch, .customer-welcome .header.links, .page-header.type5 .block-search input, .page-header.type5 .navigation .level0.parent:hover > .level-top, .page-header.type6 .block-search input, .page-header.type6 .navigation .level0:hover > .level-top, .page-header.type6 .navigation .level0.parent:hover > .level-top, .product.info.detailed.vertical .product.data.items > .item.title > .switch, .page-header.type5 .navigation .level0:hover > .level-top, .page-header.type11 .navigation li.level0.parent:hover    
97     {    
98         border-radius: 0;    
99     }    
100 }    
101 @media (min-width: 640px) {    
102     .modes-mode    
103     {    
104         border-radius: 0;    
105     }    
106 }    
107 .product-item-photo {    
108     border-radius: 0;    
109     border: 0;    
110     padding: 0;    
111 }    
112 .product-image-photo.hover_image {    
113     padding: 0;    
114     border-radius: 0;    
115 }    
116 <?php endif; ?>    
117  87 
118 <?php 88 <?php
119 if(isset($s['custom_settings']['custom_style']) && $s['custom_settings']['custom_style']) 89 if(isset($s['custom_settings']['custom_style']) && $s['custom_settings']['custom_style'])
120     echo $s['custom_settings']['custom_style']; 90     echo $s['custom_settings']['custom_style'];
121 if(isset($s['custom_settings']['custom_style_2']) && $s['custom_settings']['custom_style_2']) 91 if(isset($s['custom_settings']['custom_style_2']) && $s['custom_settings']['custom_style_2'])
122     echo $s['custom_settings']['custom_style_2']; 92     echo $s['custom_settings']['custom_style_2'];
123 ?> 93 ?>